Fixed generic height-for-width implementation of GtkBin to consider request adjustments
authorTristan Van Berkom <tristan.van.berkom@gmail.com>
Wed, 29 Dec 2010 07:26:05 +0000 (16:26 +0900)
committerTristan Van Berkom <tristan.van.berkom@gmail.com>
Wed, 29 Dec 2010 07:26:05 +0000 (16:26 +0900)
Since "->adjust_size_request()" was added, it became important for GtkBin's
generic height-for-width implementation to further check the requests
using this vfunc.

gtk/gtkbin.c

index 2e2cde65d10de12044031a35884f7d73e973acf3..af3efea2535f20bd76c1e30e881f17e3fa0bcb45 100644 (file)
@@ -211,7 +211,12 @@ get_child_padding_delta (GtkBin *bin,
    * direct vfuncs
    */
   GTK_WIDGET_GET_CLASS (bin)->get_preferred_width (GTK_WIDGET (bin), &hmin, &hnat);
+  GTK_WIDGET_GET_CLASS (bin)->adjust_size_request (GTK_WIDGET (bin), 
+                                                  GTK_ORIENTATION_HORIZONTAL, &hmin, &hnat);
+
   GTK_WIDGET_GET_CLASS (bin)->get_preferred_height (GTK_WIDGET (bin), &vmin, &vnat);
+  GTK_WIDGET_GET_CLASS (bin)->adjust_size_request (GTK_WIDGET (bin), 
+                                                  GTK_ORIENTATION_VERTICAL, &vmin, &vnat);
 
   gtk_widget_get_preferred_width (priv->child, &child_hmin, NULL);
   gtk_widget_get_preferred_height (priv->child, &child_vmin, NULL);